Revert r35877, early commit that can only be explained by a complete naivete. Nobody...

diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 440bd41..7da728a 100644 (file)
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -1539,14 +1539,6 @@ $wgAvailableRights = array();
  */
 $wgDeleteRevisionsLimit = 0;
 
-/**
- * Used to figure out if a user is "active" or not. User::isActiveEditor()
- * sees if a user has made at least $wgActiveUserEditCount number of edits
- * within the last $wgActiveUserDays days.
- */
-$wgActiveUserEditCount = 30;
-$wgActiveUserDays = 30;
-
 # Proxy scanner settings
 #
 

diff --git a/includes/User.php b/includes/User.php
index a1ef09c..315efed 100644 (file)
--- a/includes/User.php
+++ b/includes/User.php
@@ -2688,32 +2688,6 @@ class User {
                return !$this->isAllowed( 'autoconfirmed' );
        }
 
-       /**
-        * Is the user active? We check to see if they've made at least
-        * X number of edits in the last Y days.
-        *
-        * @return \bool True if the user is active, false if not.
-        */
-       public function isActiveEditor() {
-               global $wgActiveUserEditCount, $wgActiveUserDays;
-               $dbr = wfGetDB( DB_SLAVE );
-
-               // Stolen without shame from RC
-               $cutoff_unixtime = time() - ( $wgActiveUserDays * 86400 );
-               $cutoff_unixtime = $cutoff_unixtime - ( $cutoff_unixtime % 86400 );
-               $oldTime = $dbr->addQuotes( $dbr->timestamp( $cutoff_unixtime ) );
-
-               $res = $dbr->select( 'revision', '1',
-                               array( 'rev_user_text' => $this->getName(), "rev_timestamp > $oldTime"),
-                               __METHOD__,
-                               array('LIMIT' => $wgActiveUserEditCount ) );
-
-               $count = $dbr->numRows($res);
-               $dbr->freeResult($res);
-
-               return $count == $wgActiveUserEditCount;
-       }
-
        /**
         * Check to see if the given clear-text password is one of the accepted passwords
         * @param $password \string user password.